gdk: gdk_window_get_update_area don't remove alpha covered areas

gdk_window_get_update_area is supposed to get the area where things
need painting, and remove them from the update areas. However, if
some area is covered by other windows with an alpha background we
can't just expect whatever the app choses to render in the update
area as correct, so we don't actually remove these areas, meaning
they will get correctly rendered when we get to the expose handlers.

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 2fd50769bb2dc2e3ea1933028cf0f12ed5de96b6..ae57b27ef644e84a2291667e6f6ea97a249c0dd5 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -4650,7 +4650,7 @@ cairo_region_t *
 gdk_window_get_update_area (GdkWindow *window)
 {
   GdkWindow *impl_window;
-  cairo_region_t *tmp_region;
+  cairo_region_t *tmp_region, *to_remove;
 
   g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
 
@@ -4670,7 +4670,21 @@ gdk_window_get_update_area (GdkWindow *window)
        }
       else
        {
-         cairo_region_subtract (impl_window->update_area, tmp_region);
+         /* Convert from impl coords */
+         cairo_region_translate (tmp_region, -window->abs_x, -window->abs_y);
+
+         /* Don't remove any update area that is overlapped by non-opaque windows
+            (children or siblings) with alpha, as these really need to be repainted
+            independently of this window. */
+         to_remove = cairo_region_copy (tmp_region);
+         cairo_region_subtract (to_remove, window->parent->layered_region);
+         remove_layered_child_area (window, to_remove);
+
+         /* Remove from update_area */
+         cairo_region_translate (to_remove, window->abs_x, window->abs_y);
+         cairo_region_subtract (impl_window->update_area, to_remove);
+
+         cairo_region_destroy (to_remove);
 
          if (cairo_region_is_empty (impl_window->update_area) &&
              impl_window->outstanding_moves == NULL)
@@ -4681,10 +4695,7 @@ gdk_window_get_update_area (GdkWindow *window)
              gdk_window_remove_update_window ((GdkWindow *)impl_window);
            }
 
-         /* Convert from impl coords */
-         cairo_region_translate (tmp_region, -window->abs_x, -window->abs_y);
          return tmp_region;
-
        }
     }
   else